#191 Restructure homepage - part 1