Near-final - better positioning and added final elements