Cleaned up code after merging all branches, fixed spacing on resources, fixed HTML tags and CSS for events