changed layout and made stuff work