Added icons, fixed some small stuff