Redesign

I have finished the redesign and also applied some features from Robert's branch - so it's ready to be merged