Graphic layer related Bug Fixes