many layout improvements