Skip to content
mostly ui tweaks
fixes tests