Login page updates + some bug fixes