Further updates to css structure