Minor changes
Separated rendering