Changed layout a bit, added more to char