CSS changes and simple code refactor