#169, more button fixes