Improve apperance