Unifying UI, fixing bugs