Updates to design and other fun stuff
Merge of branch master