simpler layout
a few todos