app re-designed (almost done)