New Design

Feel free to review @MarcelGerber @le717.