Added paging arrows and some drawer formatting.
Format tidying.