Working on nicer looking iris
A lot of improvements