polish and fixes to buttons

[Todos] Closed issue #15