first activity fixes