Major refactoring and added Foundation CSS