fixed positioning after refactor