Skip logic Refactoring

Refactors smaller views to simpler, more MVP like pattern