Cleanup and CSS fixerating