Added WhatActivityTest and changed some layout