Cleanup, added paging
Style fixes and cleanup