Redid View with modularized code