for now done formatting and css refactoring and move to more haml