Clean Up

Removed unused Classes, add a tab for the new apps to be displayed