Updates

Change-Id: Ia19c49a9bf6c275cb62cafbe23c084c456a0eccf
Adding popup menus

Change-Id: I575495ce173e0cfcfff6dd5fd5a19dab787a0432