Fixed issue #18
Minor layout fix & prevent unnecessary events from paging controls