Refactor button creation
Fix project file