code improvements and layout changes