Fix bugs / Improve UI