Cleanup compilation errors
Update UI alittle