Additional UI changes and actvitiy implementations