Added JMenuBar Icons and cleaner code