Did some working on UI, and killed a bug