Update bass layouts, code update