Fix some stuff so it adapts to size properly