Working on fixing app design