Changed design and simplified app entirely