reupload project and fixing UI