Resolve some problems with responsive -- better way