Clean Up

General polishing and attempting to add a tab icon.