Feature/app design