Smaller modifications - Buttons changed