simplified structure and add font awesome icons