Improve attribute type selection screen