added main view and about view
merge commit