Fixing button organization