CSS Minor fixes & refactor