cleanup and fix responsive behavior