baselayout done
some more modifications