added service wizard and changed app wizard to embedded one
fixed few issues