update icons
handle invalid id; improved error page
b4 merging with master