some improvements and layout fix