Lot of rename and add ui panel classes