ui reformed and few other updates