Improve look even more