UI complete

some UI complete