Minor changes on Activity