Big update on main view
Restore subject info
Clean up the code
Merge branch 'fb-sectioned-timetable' into dev