Fixed currentAverage overflow bug and added simple tab navigation