Restructured the code, and added basic CSS