Some layout rework, added 'master' button
Fix glade path