Updated layouts, libraries and other mix fixes