Issue#361 redesign app

references #361