many layout fixes