Rearchitechted views and templates a little