Need event listeners and some layout tweaks.