Add show and fix UI bugs