a bit more styling; nesting fixes