Added category window and edited the add window.
main window
fix merge