Improve rendering and button interaction