Refactoring, cor na action bar etc.