Updated the look+feel a bit