Move the elements into views and rename to global