Fixed issues with positioning