Layout fixes and new document fix
f