More code refactor. Add more views