Added emotions functionality to first two basic screens