UI complete..
need to fix some UX and ugly look !