Separated content css from javascript and minor code cleanup