Fix layout
Fix infinite installation loop