Added todo and updated design