Streamline layout, first tweaks