Resolve #17 - Update all views to new design