Removed huge table from markup
Updated language handling