Changed overall look and layout