Revered from merged layout. Cleanup. Listeners