Some moaaarrr changes to the app