Cleaned up css and markup