Improve appearence