options/popup some fixes