Test fixes, bug fixes, css tweaks