Layout changes, minor fixes