More layout improvments