fixed UI and jon debugged a bit