Enhance Main Menu, List Applications and small clean up.