moved everything into the same div