Refactor & changed look