Refactoring Step Views

Splitting out add entry into 5 seperate views