Fixing issue with the tabs; minor improvements