Improved appearance, added icon