Frontend done
rmv comp updates