restored search button and added margins