change to ul layout, cleaned up