Fixes regression bugs
New graphics