Add Unit for Item and Revise Navigation Bar