Many many changes to app

including moving add restucturing edit and removing income.