added main view
resolve merge conflicts