src: bugs fixed, working on add sound layout