SAMZA-32; make AM dashboard look better