Feature/rework

Main app rework