Completed the usage screen
Code cleanup