re-arranged views