Fixed buttons issues