laying out new (more consistent) UI