make some stuff static
layout fixes