Cleanup and add some css love