Restructure rendering methods
Added messages.pot