Add activity basic layout + tweaks