updated todo, updated layout for future development ease