Fixed display bugs.  Added LESS version of stylesheet
Fix merge conflict