UI adjustments
merged conflicts