Fixed layout again added some buttons.