Fix styling on add-button and remove unused composiitions
Cleaner popups for add-buttons