Rework default positioning