graphics and bug fixes

Few more graphics and bug fixes