Cleanup

This cleanup made the page unstable
WIP
Reverted cleanup
Cometic changes
Multi-language support and more changes