updated to include toggle function, slight design changes