Rejig minor css, refactor