Small update, made layout more tidy