final designs done

final designs done
merge stevenBranch
change the name of the app, fixed the onClick listener for the popup, other stuff