CSS updates and further tidying up on code