Feature/redesign

Majority of official redesign complete. This version should only be temporary.