Mostly css; few other minor changes