redo complete app

included refactoring and the ordering of elements along with an
association bug removed