improve buttons and view