Partial fix with show/hide forms