Updated DeleteButtons and Functions, changed Layout