Minor changes plus toggle button structure