simplified and improved layout and design
todos