little performance and layout changes