milestone positioning fixed, refactoriing rendering