updated styling for subjects, fixed some bugs