Layout fixes, and some minor modifications.