Merge branch 'front_end'
more minor changes
got rid of unused css files