Fixed buttons but not really