Minor layout fix & prevent unnecessary events from paging controls