Added icons and changed a few things around