Reorganized a bit
added icon xD