Order count functionality add, style fixes etc.