view refactoring and completed https://github.com/shekhargulati/milestogo/issues/24