[TASK] RT-2404: UI cleanup buttons and inputs

If these are commented out, why not just take them out altogether?