Move component styles into the appropriate places
Remove logger