Delete button on bottom bar + code refactoring