updated stylesheet, cleaned up structure