Added small live tile and refactor code