Refactor+designchanges