Improved all buttons and some general layout
merge