Added resource for buttons. Looks ugly.
Cleanup
Api updated