Fix for NPE
Update PMs to new css