Re-styled and re-structured selection step
Added support to null values in asset model