Finished changes. Minor UI adjustments.