Cleaned up toggle related and added button bar for buffer toggles