moved shit
fixed merge conflict
Added flat-ui and redid the UI