Fixed so css files are loaded correctly
Merge origin/master