Cleaning up tabs and adding more components and modules