Improve home pages and some minor changes