Moving Popup buttons to the left

And fixing default code