Improve right box design