Updated to new layout and removed old buttons