Fixed and refactored positioning.
Nicer initial positioning.