Made buttons toggleable
Added heading field