Re-organized layout and added paging.