added notification numbers to side nav
fixed broken partial on cupboard
conflicts fixed