Fixed - Add and Edit screen don't need other tabs - isse #1