Clean up :on-show and add size arguments to shape functions for clarity