Improve layouts a bit
Add sounds