merge revision 500
Fix Overlaping with titleX