Some cleanup, basic css, code still very ugly