Bugfix and added visible field to form