Layout optimization & starting work on login