Fix "add something" button showing at all times
Adjustments to alerts and buttons