Remove lists helper
Fix naming
Toggle Button template