closes #5 + fixed views location