Some refactorings, colorPalette and Styling