Merged the separate views for each enum item
 - preparation for the larger update
 - removed duplicate code and styles