Few ajustments and fixes
Few ajustments and fixes on show