merge changes for filtering and menu position

merge changes for filtering and menu position