improved mw18w layout a bit