Small name changes and CSS tweaks