General redesign

Simplified code, took out all javascript