fix login, layout