Added proper notification, fix btns states