tweaks and removing add new button