Added DEV to show dev version
Fixed staging bugs in develop branch.