added Chris and layout improvements