Basic GUI

Added a few GUI elements to be able to start coding
Fixed Merge conflict

User file was giving some trouble