Resolving bugs, changing UI