moving some stuff around for the new layout