added icons
fixed request bug
lunch edit
another merge issue
merged with master; hope it didn't overwrite anything