Merged files + removed buttons

Merged files + removed buttons as per request