Clean up and minor adds to the bottom navigation