Refactor css files and order