Added more icons; minor restructure.