Modified close button and removed old buttons