code cleanup
+ dialog moved to separate component
UI improvements
merge fixed