update imports and tweak layout