Improved ui
Updated project settings
Removed idea files
Simple ui update
I hate everything about this commit
Merge from master