Fixed layout errros