Final Cleaned Up

Make appropriate comments/changes to gui