restructured app due to some broken lines and also to keep things super simple and user friendly