Change to model manager and quantity layout

Change-Id: Ib4d57ce209fde67dae7b8dd457af94f937f679c4
Signed-off-by: Chloe Xu <chloe.xu@sap.com>