Good app but it could use some changes