Attempt to improve the look