Fixed buttons again