Move some stuff to the designer