Updated the Login page, reorganized bits and pieces in both Masters