Fixing button layout/toggle features