Some corrections and layout improvements