More cleanup, fixed positions