Updated app and fixed some bugs, removed transitions :(