Moved views to separate file