Fixed major rendering issues