Additional work in Main Tab
Merge branch 'master' of https://github.com/Reaverdk/giganten