Organising login box

Got to commit to check is this works