NBIA-507	Redesign NBIA User Interface