Various UI improvements, some fixes