Improve title, footer text
Updated TODO