Debug mode fix. Moved some buttons for more space efficency.