Changed layout, look and feel