major ui & logical changes