Icons added, not yet beautiful