Fixed some  UI problem