minor adjustments
added a hack fix to the positioning problem