few improvements and layout changes