Some layout changes and added final score activity