Overall cleanup, added placeholder icons