Fixed issues regarding improper rendering