many layout and organization updates