This current build fixes the issues with positioning.