Completely reworked the format of the application