Overhaul layout, add password fields