Removed some extra buttons