old buttons and layouts removed