New Apllication classes and removed options from the DisplayGroup

Change-Id: I4cfd778a11999ecc401ecb6ed18a7e76cec8f8cd