Tenth Commit

I fixed/updated the functions on all the screens. I did not test online
though. I still have a lot more to do though. Mainly metrics.