Issue#361 redesign app

Closes #361