Started implementing pagination
ui enhancements