Made text and btn improvement.