second ommit
corrected some css bugs