add CD button, cleanup layout