merging from original and fixing little rendering issue