Aligned some buttons, added new ones where necesarry