all methods has a proper gui now
fixed merge