Login screen cleanups/improvements