New css and styling

Logic errors fixed as well