Removed count functions since they are not used anymore for pagination
Updated pagination to highlight current page