Speed up attempt, fix some CSS