Fixing layout
Fixing repository
Using trash icon instead of remove
Refactoring MenuBuilder