Issue#361 redesign application

Closes #361