layout improvments