Fix more AP deprecation, simplify some css