Merge conflicts have been fixed. Login screen is built. Main Page is mostly built. Need to fix some formatting issues between the two.