Some name fixes and layout improvements