Major cleanup and some stylesheet tryouts