ui improvements, layout and margins