Re-design application

Signed-off-by: DVKoshel <dvkoshel@gmail.com>