Updated views to use Layout