Changed constants from pixels to units
Added in previously excluded assets