Fixed column sizes, removed old css, finished markup