CSS improvements, various fixes