paging & code clean up & more icons