After reset
After merge
Integrated not ended version of right-menu + added jquery ui and made some clean up in code