Fixed LayOut issues.