some final layout changes