restructure and add some new views and styles
Merge remote-tracking branch 'ashton/overlord' into overlord
Separate views,refactor logic