layout done
marged
some fixes