Fixed non-working buttons