Fixed rendering. Will continue tomorrow...er...in the morning?