Solved error in module tabs and minor errors