Layout fixes and some documentation