Some minor change on buttons and styling