Reworked most of app