2nd Commit

Added software tab and fixed some other small problems