Fixed Design issues