Rearranged page to have different sections for different user bases
Language fixes