Bugfix & Functionality - Commit

included Paging, fixed some bugs,...