Display actions properly in Edit Window

Change-Id: Ib01b0a850ee4f8984f43a0b70ac9c3136c78c8bf