added icons and first page simple merge