Fix rendering problems
Small simplifications