Move public links to public page
Beautify