renamed some stuff to make room for fixed layout