Adjusted some positioning