Revised add button style
Cleanup button code
Remove commented code
WIP