Removed unused display styling and change order of imports
Merge styles