Fix alignment of include buttons
Fix type selection