layout master: added garage. fixed garage bug