Restructured everything and added popups for class information