fixed week sort
continuing working on design